New version

Bugs fixed and new features