Merge pull request #534 from cthrax/master