Issue #28 is done in a way that's not perfect, but definitely works for now. Also added ean-country.
Done issues #33 and #34