Minor updates
Merge branch 'master' of https://github.com/ineuron/NeuroDAQ-Analysis

Merge