Merge pull request #158 from burstly/master

Merging pull requests
Merge pull request #159 from burstly/dev

Merge pull request #158 from burstly/master