Fixing the dumbest parser error ever
Merge branch 'develop' into feature/minify