#100 - unified delete method
Merge branch 'master' of github.com:boonex/dolphin