fixes for v 2.0.1
fixes for v 2.1
Merge pull request #5 from Teplitsa/v2.0.1

V2.1