Fix bugs
Merge branch 'master' of ssh://github.com/Gedminiux/projectF
Fix more bugs