some fixes
Merge pull request #84 from dmitryshilin/go-go-go

some fixes