Merge pull request #18 from hbrunn/7.0_lp1340813