Init
Merge branch 'github-master'
Travis