Merge pull request #208 from burstly/dev

Dev
Merge pull request #210 from burstly/dev

Dev
Fixed spacing
Merge pull request #211 from burstly/master

Fixed spacing