Revert "branch 3"
Merge pull request #29 from eightamrock/revert-28-br3

Revert "branch 3"