Fixed construct issues
Merge pull request #110 from jerv13/master

Fixed construct issues
Merge remote-tracking branch 'upstream/master'