Merge #71 in master
Merge branch 'lightbox' into 71