commiting
Merge remote-tracking branch 'Cody/master'
Fixed errrors