Add -s and -l commands to program
Merge branches 'master' and 'experimental2'