Dependency maintenance
Merge pull request #400 from eric-wu/develop

Dependency maintenance