Issue solved: #60