Merge pull request #23 from Pomax/removals

element removal
rebasing