Merged additions from Martin Golebiewski.

Additions sent via email.