Merge pull request #255 from acperez/develop

Bug with clear all feature fixed