merge development into master

merge development into master for v1.0.2-final release