Close issues#16

Close issues#16