added tags to results
Merge origin/master