Bug prevention
Merge branch 'master' of ssh://github.com/just-paja/fudjan