2.1.0 support
Merge pull request #2 from asiniy/2.1.0

2.1.0 support