Working on keys
Merge pull request #2 from valeravorobjev/master

Working on keys