code cleanup and documentation
demo updates
Merge pull request #3 from ChrisMcKenzie/master

Documentation and a few updates