Feature/issue 109

This should fix issue 109 and all headers should be in last-index (column) major order to match output values.