Merge pull request #5 from Hackmodford/master