Fixed spacing issues and merged master into DRiley -JEuvin