Issue#16 Issue#17