refs #328 Fixed code documentation
refs #328 - Small code refactoring
Merge pull request #2 from cristiroma/master

Code review