added doc
Merge branch 'development' into beta