refs #1215
Merge pull request #7 from kaogua/1215

refs #1215