version 2
Merge pull request #2 from emddutton/master

version 2