First beta commit
v.05
Merge branch 'beta'