Makingversion 2.1
Merge pull request #1 from oikonomou/fixing-bug-v2.1

Version 2.1 to master