Added Nelly's work from master.
Merge pull request #11 from mfrancis95/mike

Added Nelly's work from master.