Merged with master

merged with master, still working on fixing it always merging with
errors