Merge pull request #213 from mochi/lego12239-master