feat(#54, #56): new features