Merge pull request #1 from CryWare/master

merged changes
added config file