Fix for #3

Add autocomplete configuration to both build macros