small hack to go round udid issue
v0.1.21
Merge remote-tracking branch 'upstream/master'