Merge pull request #405 from hdclark/master