Swtiched const qual. to match other methods.
Merge branch 'devel' into LM_and_decoding