done issues #102, #105