Merge pull request #62 from burstly/dev

dev stuff