Merge pull request #25 from Negusbuk/microchannel

Microchannel
Merge branch 'master' into analysis