commented
Merge branch 'master' of github.com:helme/compbio