Version bump
Merge branch 'alpha'