Updated with most recent changes from JEBLib.