Added support of "dry" mode
Fixed compiling for debian/jessie
Aesthetic fixes