Issues solved: #38, #32, #30, #24, #20, #14