branch 3
Merge pull request #3 from eightamrock/br3

branch 3