Another attempt at issue #19
Merge remote-tracking branch 'origin/beta' into live