Hoffix/alexa

this is a Alternativ PR to #78
and fix the Alexa issues #68