Revert "feature 3"
Merge pull request #4 from mlessard/revert-2-feature3

Revert "feature 3"