Rebasing on master

This pull request implement rebasing on master branch of incf-nidash/nidm-results_spm. 

@gllmflndn if you merge this pull request, your code will be updated and incf-nidash/nidm-results_spm#9 should run properly.