@markelog #1 & #3 are now addressed, and tests have been added. Moving on to the new PR for 1.x-master