Bug fixes
Setup for travis