refs #1214
Merge pull request #6 from kaogua/1214

refs #1214