#666: Testing for feature branching
Merge pull request #3 from mkemmann/feature/666-testing-feature-branching

#666: Testing for feature branching