travis support
Merge branch 'develop'
README.md included
Merge branch 'master' into develop