Merge pull request #1 from douglascraigschmidt/master

update 10/06/2014