a
Merge pull request #1 from toshi247/mac_1

a
Merge pull request #2 from toshi247/stg

Stg