merge upstream changes
resolves bug where data[:extras] or data[:aliases] not present
Merge pull request #10 from madAndroid/master

Resolves bug where data[:extras] or data[:aliases] not present