support for 2.1.0
Merge pull request #26 from asiniy/2.1.0

support for 2.1.0
refactoring and tests