Daniel rebase

@tripled2002 @undisputed-seraphim this merges commit ea8104d. Please rebase