Tempmaster

Merge tempmaster with master