Merge pull request #2 from rkv/patch-1