Update to version 2.0.2
Merge branch 'development'