Merge pull request #30 from Qorder/dev

Merge dev into master