Yah, may have overdone it a bit. I can send another pull-request either this evening or tomorrow?