fix for #20
Merge branch 'new-features'