Final touches before merging to master