482-483 + edit
Merge pull request #50 from stumbler/master

482-483 + edit