Feature branch

please add these two great features.