Merge pull request #258 from KaiHa/ticket/247