Last fixes
Merge branch 'master' of ssh://github.com/alex3165/hackcessangels