POPS-277 testing
Merge pull request #50 from vinkobuble/develop

POPS-277 testing