Merge pull request #9 from roverdotcom/issue-9

Fix Failing Tests on Travis-Ci
Merge remote-tracking branch 'origin/master' into issue-12