Issue 434

This is code in relation to Issue 434. Tested and suitable for review.