everything's ok, ready to merge in trunk. fixes #14, fixes #13