Small bug fixing v. 1.1