Added v. 1.0.8