Tests
Merge with dev
Merge branch 'master' of github.com:hermanos/audioguide into pixies