Commit 17/12
Merge branch 'master' of https://github.com/nsj3/rioja