Fix tickets #113 and #115.
Fix tickets #113 and #115.

sunaku/wmii,0intro/wmii,0intro/wmii,sunaku/wmii,bwhmather/wmii,0intro/wmii,sunaku/wmii,bwhmather/wmii,sunaku/wmii,bwhmather/wmii,0intro/wmii,sunaku/wmii,bwhmather/wmii,bwhmather/wmii