Merge pull request #135 from kochstefan/feature_chltq