Fixes #106 Adds support for defaults