Merge pull request #47 from arkwrn/patch-1