Merging pull request from mlaw