Merge pull request #1 from paraffa/master

go2
test2
go3