Bug fixed
Merge branch 'vindula2.1' of github.com:vindula/vindula.content into vindula2.1