Merge pull request #5 from dejan-brkic/2.2.x

CRAFTER-547