add maco3
Merge branch 'macobranch'