Quick bugfix
Small fixes
Added a travis configuration