Merge remote-tracking branch 'upstream/master'
add function gamma unary for higher order
fix bug in overlap and segmenter
resolve conflict
Merge pull request #35 from jogie/higherorder_and_fixbug

Higherorder and fixbug