Merge pull request #58 from GorillaApp/overlapping-features

Overlapping features