Multiple Changes
Merge pull request #9 from ammarshah/Final_Touchups

Multiple Changes