Merging changes from pull request #35 (mradamlacey:master).