Added my work :)
Merge pull request #1 from nathanblaney/master

Master merge