done issues #104, #105