New functionality added

Bugs fixed and performance enhancements