pull in latest changes from @zorkow