Solve issues: #10, #3