Pull request 40

Fixing tests in #40 and verifying TravisCI is green