added changes on v. 0.3.3