Jc5 2013

First real stab at pull request. bear with me.