Updated licence
Fixed a bug on image keys
Merge pull request #1 from kenarkose/master

Sync latest bug fixes