Merge pull request #1 from douglascraigschmidt/master

Update from original