Yes sorry, been busy with my own SS site the last couple of days :) What I will do is re-submit this request as 1 pull request along with all the changes mentioned here