Updating version to 1.0.4.
Merge branch 'gh-pages-develop' into gh-pages