krlmlr Merge pull request #185 from dpprdan/patch-1