Resolve issues #8, #9