added default values
Merge pull request #31 from yawn/defaults

Added default values