tychay Merge pull request #1 from Krinkle/patch-1 …