Merge pull request #25 from cfiken/iroiro

fix conflict