Completed issue #47.
Merge pull request #54 from bearbin/patch6

Completed issue #47.