Fix to make travis build
Merge branch 'hotfix/0.1.1'