Merge pull request #19 from Firefly74940/master

moved to 2.1
cleaned Key manager for Ivan