Issue #33 and small bug fix.