Fix issue#43.
Merge pull request #44 from d2rk/master

Fix issue #43