Merged all updates from makeusabbrew