Fixed #32. Recreated issue32 branch and reverted previous accidental commit of fix for issue #32.