fixes #15
Merge branch '#15'
fixes #16
Merge branch '#16'
backup
#7 backup
Merge branch 'origin/#7-layout'