Merge requests 12, 13 and 14 into master