adjusted defaults
Merge pull request #24 from SimonS/better_defaults

adjusted defaults