Add cleanup of directories.
Merge remote-tracking branch 'origin/master'
Change offsets to be long