Incorporate a few improvements made for other projects back into ManUp
Merge branch 'NextfazeSD-update'