This is fantastic. I could not help myself, fixed issue #3. Pain is real!