Switched version numbering scheme
Merge branch 'beta'