Merge pull request #91 from elemoine/defaults

Add missing default values