Travis support and small fixes.
Merge pull request #7 from Jbekker/fixes

Travis support and small fixes.