Cherrypick usefull commits from master

Some are only i my master branch #22.