Fix positioning bugs
Merge pull request #5 from tohachan/master

Fix positioning bugs