Small changes
Merge pull request #296 from kwlininger/patch-1

Small changes