Merge pull request #452 from alexscott/master