Support for travis
Merge pull request #60 from Jbekker/travis

Support for travis