Updates to my updates. Oy vey.
Merge pull request #7 from jibler/updates

Updates to my updates. Oy vey.