New code version
Merge pull request #9 from edelbluth/master

New code version