Los Lobos fixes #3

Tjohejsan bah
Awesome job! Go ahead and merge this back into master.