Fix bugs when no - is contained
Merge origin/master