Merge pull request #34 from dmitryshilin/go-go-go

Go go go
some alterations