Added delelte capability & merged existing pull requests from master