update aloha to latest master with Tom's fix