Fix #133
Merge pull request #134 from OHSystem/dev

Fix #133