cldwalker Merge pull request #8 from case/patch-1