Buggfix + checkpointfix
Merge branch 'Robbin'