Fixes #7 and #10
Bumps version
Merges with develop
Cleans up JSHint errors
Merge branch 'master' into release