Solved merge conflict of antillas21 branch

This pull request  solved  conflict of another pull request #95