Enhancements to project of the same name by damog.