fixes #17
Merge branch 'develop'
logging for blackhole errors
Merge commit '556830b72343341c' into develop