closes #42
Merge branch '#42-layout'