Added 2 lines at end of master branch

merged master and Edit2, Edit 1 is independent.