#108, #111 issues
 - minor issue resolved