Added automake functionality