Simplified Bellows Algorithm
Merge branch 'develop'