fixes #23
Merge branch 'bug/23-fatal-log' into dev