added 40
added 41
Merge branch 'master' of https://github.com/masterslayer/merging into three
Merge remote-tracking branch 'origin/three'