Fixed data removal issue
Merge pull request #34 from JeroenMathon/Development

Fixed data removal issue