Merge changes based on criticism from https://groups.google.com/d/msg/f3-framework/ahWmAso8YrM/XzR1GNrOAAAJ