Adding edit support
Merge branch 'master' of github.com:xiplias/hackathon