issues solved: #112 #105 #100 #103