Fixing style/standard's issues.
Merge pull request #205 from nZEDb/dev

Fixing style/standard's issues.