Merge branch '2.4' into gh-pages
Fixed #12
Merge branch 'gh-pages' into 2.4