Supermaster

Merge of kevlar and master