Closed #68 partially