choihong joon super code 28/10/2014
Merge pull request #1 from tomatoMessiah/master

choihong joon super code 28/10/2014