Changed tests directory structure
Changed tests directory structure
Moved main class to root directory
Fixed Travis config
Merge branch 'dev'
Version 1.3