Added entry removal and editing
Merge remote-tracking branch 'origin/master'
Mo work on Make