Version 1.0.4
Merge branch 'develop'
Merge branch 'develop'
Adding Travis CI image badge.
Fixed Travis CI configuration, and merged changes made in master.