Beta Development, some features missing
Merge branch 'development'