squash me to: 2d08057e94e9aaa63fa517da8d9571d0620f98da
Merge pull request #249 from fritsch/fixstring

squash me to: 2d08057e94e9aaa63fa517da8d9571d0620f98da