Updated constructor

Closes #14
Merge pull request #15 from ulrikaugustsson/master

Updated constructor