Init refactoring branch
Adjusted composer
Adjust travis
Merge pull request #51 from inspiran/master

refactor to master