Fixed billing / recipient address handling. Fixes #45.