Merge pull request #5 from stanio/issue-4