merge superproject into master

an attempt to merge superproject into master