Fix syntax due jshint warnings
Merge branch 'release/0.1.0' into dev