Merge pull request #15 from jcb82/patch-1