Merge pull request #84 from lgcareer/master