Merge pull request #1 from neutrospec/master

fix some bugs