Fixed everything
Merge origin/master