Merge branch 'master' into travis
travis working
coveralls
coveralls
Merge pull request #13 from arieldiamond/travis

Travis