Merge to master

For newcomers.