Merged old maartenstyle branch into new master