Merge branch 'release/0.2.4' into develop
Reduce the size of the distributable files
Merge branch 'release/0.2.5'
Merge branch 'master' into gh-pages