:+1: 

thanks for having the patience to read the code and point errors/improvements. I'm pushing fixes to #556