Merge branch 'hotfix/0.2.4' into gh-pages
+ 0.2.6    better portrait-mode fit
Merge branch 'hotfix/0.2.6' into develop