refs#1229
Merge pull request #14 from kaogua/1229

refs#1229