Added some additional features
Updated