Merge pull request #131 from tgiphil/CleanUp1

Code Cleanup
- Worked on exception handling (incomplete)
- Accepted new GIT line formatting
Merge branch 'master' into Exceptions2
- Worked on exception handling (incomplete)