Merge pull request #5 from rheit/master

- Catch up.