Docs, argument annotaions and PSR-2 fixes
removed unneeded empty lines in comment blocks
Merge pull request #17 from Nyholm/minors

Docs, argument annotations and PSR-2 fixes