Added default configuration
Merge pull request #16 from chives/dev

Added default configuration