Add multi-line method support
Fix bugs (with tests)