Solved bugs: #38, #35, #19, #18, #56