Final improvements on #35.
Merge branch 'master' of github.com:andrezrv/agnosia