bugfix regarding #100
Merge pull request #103 from Yangqing/master

bugfix regarding #100