add support to add or drop capabilities
Merge pull request #314 from mantiz/add-support-to-add-or-drop-capabilities

add support to add or drop capabilities