Better function detection
v0.4.0