Fix issue #43 2)

Fix issue #43 2)
Merge pull request #46 from RouxRC/patch-2

close #43