Revision 3.3 Folded in a good suggestion from Kai Niggemann.