sync against upstream
Merge branch 'master' of https://github.com/jspaleta/davitpy