fix some stufs
Merge branch 'master' of https://github.com/zimski/nahla