Merge pull request #3 from Garfeild2/master

Pull request
Fork comit 4