solved issues with MantelCor
Merge branch 'master' of ssh://ymonad.com/lemusp-r