Merge pull request #11 from merenkoff/master

Time-laps settings changes + UT