Fix fallback support. Fixes issue #12
Merge pull request #14 from darcyclarke/develop

Fix fallback support. Fixes issue #12