dndrks Merge pull request #24 from dndrks/patchup