Issue #10

FYI @jpwidmer