Merge pull request #12 from Iosnowore-Kun/master

Merge branch 'SFM-master'
Merge pull request #15 from Iosnowore-Kun/Iosnowore-Kun-8/13/2014-3-05-PM

Merge pull request #12 from Iosnowore-Kun/master