Merging DrMK's changes.