Merge pull request #1 from choi970242/master

Merge to latest
Merge pull request #2 from nikobreyno/Choi

Merge pull request #1 from choi970242/master