Updated with autotools