Merge pull request #12 from deStrO/beta

Merging beta build into Master Branch
Update README.md
Merge pull request #16 from Basert/master

updating email adress
added hotfix to !map selection
Merge branch 'master' into beta