Merge pull request #1 from douglascraigschmidt/master

asd