Master

a lot of changes have been done to master, including the merging with the other repositories.
Maybe those changes should be copied to develop branch as well?