Merge pull request #10 from vinkobuble/develop

POPS-163