Merge pull request #1 from thely/master

11/25 Pull
Merge pull request #1 from dominicperotti/master

Merge pull request #1 from thely/master