cosmetic changes;
removed Fallback;
Merge remote-tracking branch 'origin/master'