Added changes as requested in the piull-request discussion