Merge pull request #48 from vkorhonen/master

fixes
fixed add-wi-metadata to be added only once -> now works with multiple different device types