Merge pull request #16 from chives/dev

Added default configuration
Changed master branch alias in composer.json