.
Merge branch 'master' of https://github.com/zn4ke/haldor
.