Bugs fixed, new struture and examples added