Merge pull request #27 from attilaolah/goimports

Apply goimports