Added alias adding/removing to _cleanup/_setup
Merge pull request #31 from retr0h/retr0h/add-remove-aliases

Added alias adding/removing to _cleanup/_setup