Merge branch 'release/0.1.0'
Update .travis.yml
Merge branch 'hotfix/update/20141019' into develop