I also committed a change :-)
Merge branch 'master' into bug-t

Conflicts:
	sample.php
Merge pull request #20 from coreyshaffer/bug-t

I also committed a change :-)