cleanup
set variables from env
cleanup
Merge branch 'master' of https://github.com/wurde/canvas