merge on 5th july fixes # 1

Its done