Gdrooid-master branch merged