Code updated according to Coding Guidelines
Merge pull request #286 from haramrit/dirty

Code updated according to Coding Guidelines