2.0 beta 4

Hi Daniel — Since you initiated the idea, would you mind merging / creating this branch on your side as well? I'd rather people fork yours then mine, to avoid confusion. Thanks!