New check routines for output.
Merge origin/master