Solved issues: #5, #11, #13
Solved issues: #20, #19, #12