added default values
Merge pull request #1 from erming/master

added default values