Merge pull request #1 from douglascraigschmidt/master

Taking latest changes from the original