Added few new features and fixed all known bugs

Added few new features and fixed all known bugs