Merge pull request #2 from douglascraigschmidt/master

updated #2