Preparing for Travis
Preparing for Travis
Adding more tests
Merge branch 'feature/Travis' into develop