#108: committing for backup
#108: added in unit test