Merge pull request #6. Cheers to Michael Barrett