v2.0.0 beta 2 - little path improvments