some params in macros
Merge branch 'master' of github.com:luca-m/emotime