Change if-empty to a macro
Merge branch 'master' of https://github.com/cwearl/fulmar