Solved conflicts
Merge branch 'master' of https://github.com/markusmichel/Tworpus-Client