Merge remote-tracking branch 'mjschranz/issue31'