Fixes for #17 (incomplete)