fixes #18
Merge branch '#18'
join backups
Merge branch 'origin/#7-layout'