Wasting time by XML commenting old stuff..
Merged with master
Merging with master