some defaults
remove unneeded usage
Merge pull request #7 from polvi/master

Add some defaults.