add working v. 1.3.6