Issue #65 solved.

Some additional tests added. Also I have modified the wffd writer so as
to fix a small error in one of the labels.