Update to 0.7.4
Merge origin/master