#54 Replaced defaults
Merge pull request #55 from sambohler/master

#54 Replaced defaults