Merge branch 'micropeak-1.1'