refs #1223
Merge pull request #13 from kaogua/1223

refs #1223