fixes #15  fixes #20

Signed-off-by: Suki <suki@missallsunday.com>