macros improvements
Merge branch 'master' of github.com:jumpscale/jumpscale_core