Add user-defined dollar expression (Merged tang3w's awesome commits)