Merge branch 'development'
Added demos in readme file.
Fixed config typo
Updated travis config.
Updated travis config.
Merge branch 'master' into development
Updated travis config.