merge development into master

version 1.0-final