fixed bugs again
Merge branch 'master' of https://github.com/ITsvetkoFF/KV004
fixed bugs again