Merge pull request #4 from tarsius/master