Doc updated
Bugs fixed