Closing #25 and attribute values