Offered feedback
Merge pull request #1 from shirren/master

Merged with Shirren's feedback :)