Pulling latest changes from kliment/printrun