Merge pull request #5 from Tucos/feat-keyx