Merge pull request #51 from narner/develop

More sensible defaults