Merge branch 'master' of https://github.com/ejuerg/buffer.with.obstacles
Merge remote-tracking branch 'origin/dev'
Add old code