Minor
Merge branch 'master' of github.com:alejandrovze/MS
fixed bugs