test + small rewrite
Merge pull request #1 from DeyV/master

test + more GO style