Merge pull request #7 from alaframboise/master

Fixed comments - merging in.
Removed for demo theater