clarification
clarification clarification
Merge branch 'master' of http://github.com/StoneCypher/derp