Issue718

PR for #718