Revert "merge"
Merge pull request #11 from joelkeeling/revert-10-joel-adding

Revert "merge"