Merge pull request #372 from karky7/master

Please pull request, thank you.