Merge branch 'hotfix/0.1.22' into gh-pages
+ 0.1.24   qik fix
Merge branch 'hotfix/0.1.24' into develop