chuyachia Merge pull request #40 from chroute/small-fix