unix conf changed
Merge branch 'master' of https://github.com/maxvas/jinn