Close ticket

close ticket #16