Completed issue #58
Merge pull request #59 from Qorder/issue#58

Completed issue #58