fixed nasty pointer issue
Merge branch 'Memento'
Merge branch 'master' into XMLLoader