Fix test failure
Merge pull request #357 from eric-wu/develop

Fix Travis test failure