Addition of gonzoi's fork.