Merge pull request #1 from guesn10000/master

Pull by gitcooling.