Merge pull request #384 from nightcoffee/nightcoffee-patch-1