refactored code and removed marker-clusterer directive
fixed tests
Version 0.19.1