2.1.1 version
Merge pull request #16 from Smartik89/2.0b

2.1.1 version