Merge pull request #23 from mdw55189/issue-19