Merge pull request #116 from mne-tools/master

Update