Merge pull request #53 from KosToZyB/master

Fixed golint warnings