Rebuild, added version helper targets