Fixes sample layout
Merge branch 'hotfix'
Release 0.2.2