merge

merging master for 70%