Issue #41 C2 mohammad abdulkhaliq #41 create/edit tag reopened

Issue #41 and Issue #97  Merged 

@muhammedabuali @omar-kassem @msameh93 

Please Review

Notes :