last minute fixes
Merge branch 'master' of https://github.com/mikefrangos/mmvc
Merge branch 'master' of https://github.com/mikefrangos/mmvc