issues solved: #114 #100 #104 #108 #94