Simply constructor (take 2)
Merge pull request #3996 from wilsonge/patch-19

Simply constructor (take 2)