New code version
Merge pull request #12 from edelbluth/new_code

New code version