edited from fresh downloaded
Merge branch 'master' of https://github.com/iaretechnician/firstwave.altis