Little adjustment on norem stuff
Merge pull request #393 from Kenny9999/development

Little adjustment on norem stuff