Issues solved: #35 #42 #46 #47