close #12
close #13

Signed-off-by: Tomasz Kamiński <kaminski.tomasz.a@gmail.com>