Singularity

Hi, can you add this wonderful modification to the "master"?