keijiro Merge pull request #3 from andybak/patch-1