tweaks
Merge pull request #35 from jmdetloff/john/tweaks

tweaks