Partly fixed
Merge branch 'master' of github.com:0pq76r/lunkwill
Some fixes
Merge branch 'master' of github.com:0pq76r/lunkwill