tidier
Merge pull request #3 from rklyne/master

tidier