Update of Thomas Luft's original - View it on GitHub