Added crepuscular extract, small bug fixes
Merge branch 'origin/master'