Merge pull request #6 from KellyBlack/Dev

Pulled Amanda's changes into the dev branch