Changed whitespace in main.xml to better match ApmeM's original
Merge branch 'andreas'