Resolved bug with default values. Fixes #23