Merge branch 'development'
UPD removing erroneous disclaimer
Merge branch 'master' into development