New Code version
Merge pull request #11 from edelbluth/new_code

New Code version