Fixed image scaling issues, introduced "stretch" option