v0.5.1 : Bug correction and improvement