Merge review 224 by @tryneus