Merge pull request #1 from T3h-N1k0/master

Pull upstream commits