fix to fbbee5c
close #15
small fixes