Tweaks
Merge pull request #1 from jgn/jn-2013

Tweaks