master #1

Open
pvoa73ger wants to merge 6 commits from master into gxb_branch