Revised version to 1.0.7