Merge pull request #504 from wyager/master