Better resource management for v2
Merge branch 'master' of https://github.com/LightBuzz/Vitruvius.git