Will's commit
Merge pull request #4 from negativetwelve/will/feature

Will's commit