hagata Merge pull request #36 from Krinkle/patch-1