Merge pull request #53 from kiyono/kiyonofork