Added optional default values
Merge pull request #47 from johanneswuerbach/patch-1

Added optional default values