Pull req : ref PR 23 @Excellent

Thanks :) Created a new PR