many improvements
Merge branch 'master' of github.com:psy0rz/stuff