Features added
Bugs fixed