Remove is allowed
Merge pull request #43 from jerv13/master

Remove is allowed
Merge remote-tracking branch 'upstream/master' into autoship-edit