Merge pull request #147 from pepelsbey/master

Key handling refactoring