Several changes have been made and new files have been added
Merge pull request #1 from charounsons/master

Corrections and Additions