typing errors
Merge branch 'master' of github.com:GS42/mas2013