More Cleanup
Merge pull request #10 from kcristiano/kjc-1.2

More Cleanup