Edits 19,88
+ 480
Merge pull request #48 from stumbler/master

Edits 19,88 + 480