Updated with latest 1.4 release