Merge pull request #5 from ian-kelling/master