Merge pull request #14 from iwhitfield/master

Verified and merging.
Merge pull request #16 from iwhitfield/master

Tested and looks good. Merging.