merge pull request from erkim/master