f
g
Merge pull request #11 from toshi247/mac_3

Mac 3
Merge pull request #12 from toshi247/stg

Stg