Merge pull request #27 from alex-deaconu/master

[chore] Code cleanup, jshint change, added test