#43 Fixed major codenarc problems
Merge remote-tracking branch 'origin/dev' into dev