removed default config
standalone refactoring
Merge pull request #4 from zelgerj/master

standalone refactoring