Merge pull request #415 from unquietwiki/patch-1