pull request
pushing up merged changes
Merge pull request #25 from Yahkob/dev

merge dev / master
resolved merge conflicts
resolved merge conflicts
Merge pull request #28 from dhfromkorea/dev

resolved merge conflicts