fix tasks
merged
fix tasks 2
Merge branch 'master' of github.com:lkdnvc/penta-house
fix tasks3