Issues solved: #67 #70