Adding options -m and -s (explanation in pull request)