Bugfix
Merge branch 'vindula2.1' of github.com:vindula/vindula.myvindula into vindula2.1