included some small changes from oostenveld/master
Merge branch 'master' of github.com:fieldtrip/fieldtrip