Cleaning and bug fix.
Fixed conflicts.
Added example.