Merged @marccampbell pull request