Merge pull request #121 from burstly/dev

Merge pull request #120 from burstly/master
Merge pull request #122 from burstly/master

Merge pull request #121 from burstly/dev