fix SAPART
Merge branch 'master' of github.com:merc-devel/merc