Merge branch 'master' of https://github.com/mmagicbox/mmagicbox.github.com
Merge branch 'master' of https://github.com/mmagicbox/mmagicbox.github.com