refs #1217
Merge pull request #11 from kaogua/1217

refs #1217