Manda/logging and options together in harmony

Depends on PR#6 and PR#5