all the right moves in all the right places
Merge pull request #53 from MarkTonkinson/master

all the right moves in all the right places