Upgrade to GA v2 beta 4: Fixes #1