Merge pull request #299 from dbellettini/master

Coding Standard Fixing