Added a feature suggested by Jake