Eliminate LOCAL_BUFFER code
Tidy map() code and add an on/off switch for all identifiers
Merge pull request #12 from willp-bl/master

Tidy code, eliminate LOCAL_BUFFER and add on/off switch for all identifiers