Time options added
Merge branch 'master' of git@github.com:EnoahNetzach/fourFs.git