Merge pull request #46 from rickcarlino/master

May 21st
Merge pull request #47 from rickcarlino/master

May 21st
Light cleanup, fixed failing spec