Newest code status from tests/1
Merge pull request #7 from edelbluth/tests/1

Newest code status from tests/1