blablack Merge pull request #11 from hellocatfood/patch-1