feature #207: merging from tags
Merge pull request #208 from massiveart-webservices/feature/207

feature #207: merging from tags