cleaner directory code
Merge branch 'master' of github.com:zetwal/compositing