added address management, fixes #73. fixes dioscouri/amritasingh-f3#88