Added fallbacks
Merge pull request #3 from odino/small-tweaks

Added fallbacks