Fixed #70 and #68