BUG FIX and v0.2.0 Final release