Fixes code conventions. Sorry :P
Merge branch 'dev'