Change some defaults
Merge pull request #12 from escherba/dev

Change some defaults