Re-added address, closes #12