bugfixing G
Merge origin/master