Refactor parameter annotations processing

Applied patch from !29 (closed) . I'm creating new merge request, because the master branch on my fork got messed up and showing multiple commits