Merge branch 'master' of github.com:P87/phdbm