Added support for default values, closes #17