finally closing #105 :)