Fixes for docblocks and CS errors
Docblock fixes
Merge pull request #29 from ADmad/develop

Fixes for docblocks and CS errors