Fixing the blasted not working commits
Merge remote-tracking branch 'origin/master'