New code version
Merge pull request #16 from edelbluth/tests/1

New code version