Merge branch 'master' into development
[UPDATE] major simplifications
[UPDATE] testing 2.1.5
[UPDATE] working on it...
Merge branch 'development'