Merge branch 'master' of https://github.com/Timoschik/gitPractice into develop