Merge pull request #13 from bluesoft-rnd/RELEASE-2.1

Release 2.1