Merge pull request #110 from jerv13/master

Fixed construct issues