Merge to master

No more need of a separate branch