Cleaner implementation for gettin current term, fixed #52, #54