ckaltsidis

issue #19, issue #20