add changes from berwinter Rev72
remove empty spaces