refactoring
Merge branch 'master' of github.com:pluto-/Gcom

Conflicts: