resolved merge conflict
Merge pull request #35 from dhfromkorea/master

resolved merge conflict