Blerg changes
Blerg blerg.
Merge branch 'master' of https://github.com/QI-Labs/guias