the dj branch got merged to master
updated with up to date information