Organizing Code
Minor Fix
Merge pull request #63 from chrishumboldt/dev-chris

Dev chris