Completed issue#39
Completed issue#40
Merge pull request #41 from Qorder/issue#39

Completed issue #39 #40
Completed issue #43
Merge pull request #44 from Qorder/issue#43

Completed issue #43
Merge pull request #45 from Qorder/dev

Merge dev into master