Commit 45

Fixed problem with remove (again? Oo)