Merge pull request #15 from modamoda/master

Resolved issue #3 and #7 - key was not extracted properly