Final class
Merge branch 'develop' of git://github.com/spiffyjr/spiffy-inject into develop