Added addresses. Closes #5