Merge pull request #23 from alvar0hurtad0/master

Coding standard issues + annotation of inheridoc should be between {}