crucialfelix Merge pull request #3 from panisterfatheroy/patch-1