Updated constructor

Closes #14