Merge branch 'stable'
Merge branch 'stable'
Merge branch 'stable'
readme
run travis
fix tests
Merge branch develop into master
fix deploy
fixes
fixes
fix tests