Add new feature 'bougatsa'
Resolve conflicts in README