Synced up marc's and eric's versions into 1.