Feature: Updated to work correctly with travis-ci and coveralls.io