First-version
Fixing of the edit view
Merge pull request #1 from JigneshSatam/master

Master