Issues solved: #71 #72