Merge pull request #35 from xStrom/master

Out-of-bounds memory access violation fix.
Fixes from go vet