Makingversion 2.1

Wanting to merge fixing_bug-v2.1 to master