Fixes #3, add information on branches, new structure