Merge pull request #1 from hongkyukim/master

this is master from master  -- merge allowed
Merge pull request #2 from hongkyukim/master_hong

Merge pull request #1 from hongkyukim/master
master hong 1
master hong 2
Merge pull request #3 from hongkyukim/master_hong

Master hong 1+2
Merge branch 'master' into master_kyu
update masterhong2