Bdk3079/ 1addition

Fixes #14 and #19