Fixed for new constructors
Merge pull request #89 from WannabeSid/master

Fixed for new constructors