Merge pull request #3 from messianicdelusions/patch-3