fix some bugs
Merge pull request #52 from Rpsl/v0.7.4

v0.7.4