Cleaning up code
Testing Hell
Finished with Testing.
Finished Testing and Updated base on Rebase Changes
Merge pull request #23 from mikephoran/master

Finished Testing!!!