Issue #66 #67 #68