Corrections & upgrade to version 0.0.2