close #88 close #89 close #90 close #91 close #92 WITHOUT CHECKING!!!!!!
merge Adrian to develop