Added lazy default values, closes #31