Merge pull request #690 from ricl/dev-0.3

fixed jshint errors