getting the latest
getting the latest from upstream

Merge branch 'master' into overlap-bug
fixed that collapse bug
Getting the latest from upstream

Merge branch 'master' into overlap-bug
fixed overlap bug
Merge pull request #11 from marcnischan/overlap-bug

Overlap bug