address markhamstra comments
merge from origin