Added fallback handlers
Merge branch 'master' of github.com:ras0219/zinc