Fix #28
Fix #27
Merge pull request #32 from douhack/layout

Layout