Completed issue #12.
Merge pull request #17 from genghisjahn/jw_12

Completed issue #12.