Merge pull request #11 from damjanek/master

Add AZ fallback