further simplified the rebuild task
Merge branch 'master' of github.com:unepwcmc/SAPI