Added some new features and improved some old ones
Signed-off-by: Cata <beyond_k7a@yahoo.com>