Added extending, fixed bugs, upped version