Issue 35 fixed.