update to latest from douglascraigschmidt:master