sync
Merge branch 'develop' of https://github.com/landcolin/gm_phd_py into develop