commit
Merge pull request #70 from moyoron64/go7

commit