Merge pull request #438 from mattleibow/master