Merge pull request #30 from Qorder/dev

Merge dev into master
Merge pull request #33 from Qorder/master

Merge pull request #30 from Qorder/dev