Fixed some errors with a REAL IDE :P
Merge remote-tracking branch 'origin/master'
Fixed some errors with a REAL IDE :P