Merge pull request #26 from ksmithut/develop

Develop
removed unnecessary semicolons
1.3.2
fixed package.json conflict (version number)