Add remove button
Some changes
Merge pull request #5 from krausv/develop

Develop