Hi Ferran - this pull request looks good, thanks for that! 

Just out of curiosity, what is this MA_C4A_USER setting?