Fixed errors
Signed-off-by: Andreas Larsen <northcode.no@gmail.com>
Merge branch 'dev' of https://github.com/Jenjen1324/MCM-v3 into dev