Added Mingyu's changes
Merge pull request #131 from chsticksel/develop

Added Mingyu's changes