Issues/#19

for #19