Merge branch 'master' of github.com:naderst/jnazareno