Update to beta3

Rebased & squashed version of #14