Add my changes to peter's
Merge pull request #10 from shariannvalenta/master

Some changes from Shari