Merge tag '2.0.2' into develop

2.0.2
Fixed the version number