Merge pull request #3 from rockman507/3_3-testing

3 3 testing