Update to beta3

Rebased & squashed version of #14 
This is not beta3, that's the problem.