Merge cmv3 into master

@gruehle 

DON'T TASE ME BRO