Rezipped up Source to reflect changes
Merge pull request #119 from aaronjrich/master

Rezipped up Source to reflect changes for #118