refactored names
added mocha tests
travis support added