Pull Request from omoto