Merge branch 'master' of https://github.com/Precea/bjd.li.git