This commit fixes #4 and fixes #10

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