Pull Request from omoto 20141025