Minor changes and updated user guide
Merge pull request #41 from conclarke/master

Minor changes and updated user guide