Converted delete method to return boolean instead of string
Merge remote-tracking branch 'origin/dev' into dev