Implemented timelapse configuration (issues #86, #87)
Merge conflict fixed