Add macro support to upload-watch-dir [Closes #31]