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

Completed issue #39 #40