little changes and testing
Merge branch 'master' of https://github.com/Lastramus/begin