extended to handle two branches
Merge pull request #34 from dassau/manual_en_v1.8

extended to handle two branches