Merge pull request #25 from bdjackson/master

Merge with Leigh changes