! Fix #5 and little bugs

Signed-off-by: Volodymyr Gamula <v.gamula@gmail.com>