Master merged with todd's fork