Fix bugs
revert info
Merge pull request #16 from turbogreddy/fix_bugs

Fix bugs
Merge remote-tracking branch 'upstream/master'