Merging bay12's and custom codes to our github
Merge remote-tracking branch 'origin/master'