update to latest versions
Merge branch 'master' of https://github.com/wwagner4/doctus.git