tests passing
using mocha locally for testing
Merge pull request #1 from chelm/master

Test passing