Finalise 2.0.2. Fix #1 Fix #4