Merge pull request #586 from M2Ys4U/dep-update