Merge pull request #73 from jvrdom/jd-dev

Again... siempre me he de olvidar.