Merge pull request #1 from konfirm/master

Pull request to update fork