Fix Travis failure
Merge pull request #364 from eric-wu/develop

Fix Travis failure