Merge pull request #173 from burstly/master

Merge pull request #172 from burstly/dev
Merge pull request #174 from burstly/dev

Merge pull request #173 from burstly/master