Fixed #13 - broken lists, api changed.