Revert "should we combine"
Merge pull request #6 from dd508/revert-4-master

Revert "should we combine"