Converted spaces to tabs
Added architecture checks to all operating systems