Bug fixes and performance tweaks
Merge branch 'master' of https://github.com/horatiu-stoianovici/Planes.git