Merge pull request #1 from darkksebs/master

Pull request