Start of macros
Updated travis
Merge branch 'master' into lifted