Fixes #106 Adds support for defaults
Trying to get this spec to pass