pol fixes
Merge branch 'mspec2' of github.com:marius311/mspec into mspec2