Merge pull request #9 from kcristiano/kjc-1.2

Whitespace cleanup
Merge pull request #10 from kcristiano/kjc-1.2

More Cleanup
Merge pull request #13 from tadpolecc/1.2

1.2