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

Completed issue #43