Suggestions for 10.6
Merge pull request #167 from hmmueller/10_6

Suggestions for 10.6