add security to remove method, fix bugs
Merge pull request #7 from Herzucco/AddMethodRemove

add security to remove method, fix bugs