greysteil Merge pull request #1 from doismellburning/patch-1