Several more fixes and tests
Running 1.6.2 - Small Code Clean Up
Merge pull request #17 from TrinaryAtom/Development

Small Fixes and Code Cleaning