+484
485-490
Merge pull request #51 from stumbler/master

484-490+