Merge pull request #25 from Skullbock/development

gh-23 Asset ID support
Closes gh-25 Refactored the asset key assignment