Merge pull request #4 from TheDizzler/Wonho

Wonho
2014/06/10 commit by wono
2014/06/10 commit by wono