Added support for multiple branches and tags
Updated s2jsf