added before & after arguments, bump to 3.0.7