Merge pull request #52 from narner/develop

Added more sensible defaults