Branch update
Merge pull request #1 from jakob-e/branch-test

 Branch update